Rename gdk_device_get_surface_at_position_double

We can drop the double suffix now.

diff --git a/demos/gtk-demo/changedisplay.c b/demos/gtk-demo/changedisplay.c
index 0a963fe15723abe6775cc8415ad9f500a5fee77f..5f5717c43d854affc5d9100b4d6bcfae58229645 100644 (file)
--- a/demos/gtk-demo/changedisplay.c
+++ b/demos/gtk-demo/changedisplay.c
@@ -71,7 +71,7 @@ find_toplevel_at_pointer (GdkDisplay *display)
   GdkSurface *pointer_window;
   GtkWidget *widget = NULL;
 
-  pointer_window = gdk_device_get_surface_at_position_double (gtk_get_current_event_device (), NULL, NULL);
+  pointer_window = gdk_device_get_surface_at_position (gtk_get_current_event_device (), NULL, NULL);
 
   if (pointer_window)
     widget = GTK_WIDGET (gtk_root_get_for_surface (pointer_window));

diff --git a/docs/reference/gdk/gdk4-sections.txt b/docs/reference/gdk/gdk4-sections.txt
index 057726e65c109716a8c7962bab4326669c40a5d7..281e86f33d57effbe3a1fc7ab15bd8eafd60dfc4 100644 (file)
--- a/docs/reference/gdk/gdk4-sections.txt
+++ b/docs/reference/gdk/gdk4-sections.txt
@@ -510,7 +510,7 @@ gdk_device_ungrab
 <SUBSECTION>
 gdk_device_get_state
 gdk_device_get_position
-gdk_device_get_surface_at_position_double
+gdk_device_get_surface_at_position
 gdk_device_get_history
 gdk_device_free_history
 GdkTimeCoord

diff --git a/gdk/gdkdevice.c b/gdk/gdkdevice.c
index 2811bb4569c446ae498dfde39ac869c3084fa725..9abdacda68c814bd49ddaf8aca66a57f921298bf 100644 (file)
--- a/gdk/gdkdevice.c
+++ b/gdk/gdkdevice.c
@@ -568,7 +568,7 @@ gdk_device_get_position (GdkDevice *device,
 }
 
 /**
- * gdk_device_get_surface_at_position_double:
+ * gdk_device_get_surface_at_position:
  * @device: pointer #GdkDevice to query info to.
  * @win_x: (out) (allow-none): return location for the X coordinate of the device location,
  *         relative to the surface origin, or %NULL.
@@ -587,9 +587,9 @@ gdk_device_get_position (GdkDevice *device,
  *   device position, or %NULL.
  **/
 GdkSurface *
-gdk_device_get_surface_at_position_double (GdkDevice  *device,
-                                          gdouble    *win_x,
-                                          gdouble    *win_y)
+gdk_device_get_surface_at_position (GdkDevice *device,
+                                    double    *win_x,
+                                    double    *win_y)
 {
   gdouble tmp_x, tmp_y;
   GdkSurface *surface;

diff --git a/gdk/gdkdevice.h b/gdk/gdkdevice.h
index 24150e5afb1169fd6dc40f674460af4f8a81399c..3ae1c209caeb7871077b4bb14245c26bc97ade89 100644 (file)
--- a/gdk/gdkdevice.h
+++ b/gdk/gdkdevice.h
@@ -171,11 +171,9 @@ void     gdk_device_get_position (GdkDevice *device,
                                   double    *x,
                                   double    *y);
 GDK_AVAILABLE_IN_ALL
-GdkSurface *
-         gdk_device_get_surface_at_position_double
-                                 (GdkDevice         *device,
-                                  gdouble           *win_x,
-                                  gdouble           *win_y);
+GdkSurface * gdk_device_get_surface_at_position (GdkDevice *device,
+                                                 double    *win_x,
+                                                 double    *win_y);
 GDK_AVAILABLE_IN_ALL
 gboolean gdk_device_get_history  (GdkDevice         *device,
                                   GdkSurface         *surface,

diff --git a/gdk/wayland/gdksurface-wayland.c b/gdk/wayland/gdksurface-wayland.c
index 984e26e6e370282f5dd62e6861439b8c4df35734..546226bae0c35fe3df5f0e36f1266db2d4285ed4 100644 (file)
--- a/gdk/wayland/gdksurface-wayland.c
+++ b/gdk/wayland/gdksurface-wayland.c
@@ -2447,14 +2447,14 @@ gdk_wayland_surface_map (GdkSurface *surface)
                     GDK_SURFACE_IMPL_WAYLAND (attached_grab_surface->impl);
                   grab_device = gdk_seat_get_pointer (attached_impl->grab_input_seat);
                   transient_for =
-                    gdk_device_get_surface_at_position_double (grab_device, NULL, NULL);
+                    gdk_device_get_surface_at_position (grab_device, NULL, NULL);
                 }
             }
           else
             {
               grab_device = gdk_seat_get_pointer (impl->grab_input_seat);
               transient_for =
-                gdk_device_get_surface_at_position_double (grab_device, NULL, NULL);
+                gdk_device_get_surface_at_position (grab_device, NULL, NULL);
             }
 
           if (transient_for)

diff --git a/gdk/win32/gdkdevicemanager-win32.c b/gdk/win32/gdkdevicemanager-win32.c
index a7043b40b4abd103c141e348474c7e794067ed29..cc396f05639c9e9a5168d7f7c83ed4170c922776 100644 (file)
--- a/gdk/win32/gdkdevicemanager-win32.c
+++ b/gdk/win32/gdkdevicemanager-win32.c
@@ -902,7 +902,7 @@ gdk_input_other_event (GdkDisplay *display,
     }
 
   device_manager = GDK_DEVICE_MANAGER_WIN32 (_gdk_device_manager);
-  window = gdk_device_get_surface_at_position_double (device_manager->core_pointer, &x, &y);
+  window = gdk_device_get_surface_at_position (device_manager->core_pointer, &x, &y);
 
   if (window)
     g_object_ref (window);

diff --git a/gtk/gtktooltip.c b/gtk/gtktooltip.c
index 9de95a6d3ded8913f8060ce8b748f382e7eee0d3..f5c155c2a32af108d3a701c61b917bb54f6e42de 100644 (file)
--- a/gtk/gtktooltip.c
+++ b/gtk/gtktooltip.c
@@ -394,7 +394,7 @@ gtk_tooltip_trigger_tooltip_query (GtkWidget *widget)
 
   /* Trigger logic as if the mouse moved */
   device = gdk_seat_get_pointer (gdk_display_get_default_seat (display));
-  surface = gdk_device_get_surface_at_position_double (device, &x, &y);
+  surface = gdk_device_get_surface_at_position (device, &x, &y);
   if (!surface)
     return;
 

diff --git a/gtk/inspector/inspect-button.c b/gtk/inspector/inspect-button.c
index 83867b8b8d8203d4ef7e3900c3f199d1e217cec6..76e52f4df1cd66319206e9b62cfead483bf53c30 100644 (file)
--- a/gtk/inspector/inspect-button.c
+++ b/gtk/inspector/inspect-button.c
@@ -43,7 +43,7 @@ find_widget_at_pointer (GdkDevice *device)
   GtkWidget *widget = NULL;
   GdkSurface *pointer_surface;
 
-  pointer_surface = gdk_device_get_surface_at_position_double (device, NULL, NULL);
+  pointer_surface = gdk_device_get_surface_at_position (device, NULL, NULL);
 
   if (pointer_surface)
     widget = gtk_root_get_for_surface (pointer_surface);